Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Each commit does some little cleanups:

  • We had some Res comparisons in multiple places (and still do, but unless we use a macro, it's not possible to "merge" any further) so I moved it into a function.
  • It was weird to have some utils function used everywhere in visit_ast so I instead moved it into clean/utils.rs.
  • In HTML rendering, we had some write "issues":
    • Multiple calls that could be merged into one.
    • Some write! that could be write_str.
    • We didn't use the new format! args much.

r? @notriddle

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 27, 2023
@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 28, 2023

📌 Commit 2221924 has been approved by notriddle

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 28, 2023
…notriddle

Rustdoc small cleanups

Each commit does some little cleanups:

 * We had some `Res` comparisons in multiple places (and still do, but unless we use a macro, it's not possible to "merge" any further) so I moved it into a function.
 * It was weird to have some utils function used everywhere in `visit_ast` so I instead moved it into `clean/utils.rs`.
 * In HTML rendering, we had some write "issues":
   * Multiple calls that could be merged into one.
   * Some `write!` that could be `write_str`.
   * We didn't use the new `format!` args much.

r? `@notriddle`
@matthiaskrgr
Copy link
Member

wondering if this failed #114176 (comment) 🤔

@GuillaumeGomez
Copy link
Member Author

Yes it seems so!

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2023
@GuillaumeGomez
Copy link
Member Author

The problem was a one line r#"" string that became multi-line. Removed the r# part.

@GuillaumeGomez
Copy link
Member Author

@bors r=notriddle rollup

@bors
Copy link
Collaborator

bors commented Jul 28, 2023

📌 Commit 65f311d has been approved by notriddle

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 28, 2023
…notriddle

Rustdoc small cleanups

Each commit does some little cleanups:

 * We had some `Res` comparisons in multiple places (and still do, but unless we use a macro, it's not possible to "merge" any further) so I moved it into a function.
 * It was weird to have some utils function used everywhere in `visit_ast` so I instead moved it into `clean/utils.rs`.
 * In HTML rendering, we had some write "issues":
   * Multiple calls that could be merged into one.
   * Some `write!` that could be `write_str`.
   * We didn't use the new `format!` args much.

r? `@notriddle`
@bors
Copy link
Collaborator

bors commented Jul 29, 2023

☔ The latest upstream changes (presumably #113522) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 29, 2023
@GuillaumeGomez
Copy link
Member Author

Fixed merge conflict.

@bors r=notriddle rollup

@bors
Copy link
Collaborator

bors commented Jul 29, 2023

📌 Commit b7871e5 has been approved by notriddle

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 29, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#114129 (Rustdoc small cleanups)
 - rust-lang#114152 ([rustc][data_structures] Simplify binary_search_slice.)
 - rust-lang#114222 (Mark `lazy_type_alias` as incomplete)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fa94851 into rust-lang:master Jul 30, 2023
@bors
Copy link
Collaborator

bors commented Jul 30, 2023

⌛ Testing commit b7871e5 with merge fb53384...

@rustbot rustbot added this to the 1.73.0 milestone Jul 30, 2023
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-cleanup branch July 30, 2023 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants